Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Mon, 26 Feb 2007 10:23:03 +0000 (10:23 +0000)
committerTim Deegan <Tim.Deegan@xensource.com>
Mon, 26 Feb 2007 10:23:03 +0000 (10:23 +0000)

Trivial merge